From 038398d49326ca55dd8fa8e1dd18dfeb19e36465 Mon Sep 17 00:00:00 2001 From: Alexander Larsson Date: Wed, 1 Jul 2009 16:13:31 +0200 Subject: [PATCH] Move new draw_drawable argument to end to make it more backwards compat --- gdk/gdkdraw.c | 5 +++-- gdk/gdkdrawable.h | 4 ++-- gdk/gdkoffscreenwindow.c | 4 ++-- gdk/gdkpixmap.c | 8 ++++---- gdk/gdkwindow.c | 8 ++++---- gdk/quartz/gdkdrawable-quartz.c | 4 ++-- gdk/win32/gdkdrawable-win32.c | 8 ++++---- gdk/x11/gdkdrawable-x11.c | 8 ++++---- 8 files changed, 25 insertions(+), 24 deletions(-) diff --git a/gdk/gdkdraw.c b/gdk/gdkdraw.c index 321b883cb3..ad0af7989a 100644 --- a/gdk/gdkdraw.c +++ b/gdk/gdkdraw.c @@ -669,11 +669,12 @@ gdk_draw_drawable (GdkDrawable *drawable, area in the destination instead. */ GDK_DRAWABLE_GET_CLASS (drawable)->draw_drawable (drawable, gc, - composite_impl, src, + composite_impl, xsrc - composite_x_offset, ysrc - composite_y_offset, xdest, ydest, - width, height); + width, height, + src); g_object_unref (composite); } diff --git a/gdk/gdkdrawable.h b/gdk/gdkdrawable.h index 1d8d69471d..21af0d1dc8 100644 --- a/gdk/gdkdrawable.h +++ b/gdk/gdkdrawable.h @@ -100,13 +100,13 @@ struct _GdkDrawableClass void (*draw_drawable) (GdkDrawable *drawable, GdkGC *gc, GdkDrawable *src, - GdkDrawable *original_src, gint xsrc, gint ysrc, gint xdest, gint ydest, gint width, - gint height); + gint height, + GdkDrawable *original_src); void (*draw_points) (GdkDrawable *drawable, GdkGC *gc, GdkPoint *points, diff --git a/gdk/gdkoffscreenwindow.c b/gdk/gdkoffscreenwindow.c index 2c1157c271..8a020bbe60 100644 --- a/gdk/gdkoffscreenwindow.c +++ b/gdk/gdkoffscreenwindow.c @@ -284,13 +284,13 @@ static void gdk_offscreen_window_draw_drawable (GdkDrawable *drawable, GdkGC *gc, GdkPixmap *src, - GdkDrawable *original_src, gint xsrc, gint ysrc, gint xdest, gint ydest, gint width, - gint height) + gint height, + GdkDrawable *original_src) { GdkOffscreenWindow *offscreen = GDK_OFFSCREEN_WINDOW (drawable); GdkDrawable *real_drawable = get_real_drawable (offscreen); diff --git a/gdk/gdkpixmap.c b/gdk/gdkpixmap.c index e4d8869286..e9f33aa847 100644 --- a/gdk/gdkpixmap.c +++ b/gdk/gdkpixmap.c @@ -72,13 +72,13 @@ static void gdk_pixmap_draw_text_wc (GdkDrawable *drawable, static void gdk_pixmap_draw_drawable (GdkDrawable *drawable, GdkGC *gc, GdkPixmap *src, - GdkPixmap *original_src, gint xsrc, gint ysrc, gint xdest, gint ydest, gint width, - gint height); + gint height, + GdkPixmap *original_src); static void gdk_pixmap_draw_points (GdkDrawable *drawable, GdkGC *gc, GdkPoint *points, @@ -375,13 +375,13 @@ static void gdk_pixmap_draw_drawable (GdkDrawable *drawable, GdkGC *gc, GdkPixmap *src, - GdkPixmap *original_src, gint xsrc, gint ysrc, gint xdest, gint ydest, gint width, - gint height) + gint height, + GdkPixmap *original_src) { GdkPixmapObject *private = (GdkPixmapObject *)drawable; diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c index bf35eeabf2..d15b660f78 100644 --- a/gdk/gdkwindow.c +++ b/gdk/gdkwindow.c @@ -188,13 +188,13 @@ static void gdk_window_draw_text_wc (GdkDrawable *drawable, static void gdk_window_draw_drawable (GdkDrawable *drawable, GdkGC *gc, GdkPixmap *src, - GdkDrawable *original_src, gint xsrc, gint ysrc, gint xdest, gint ydest, gint width, - gint height); + gint height, + GdkDrawable *original_src); static void gdk_window_draw_points (GdkDrawable *drawable, GdkGC *gc, GdkPoint *points, @@ -3485,13 +3485,13 @@ static void gdk_window_draw_drawable (GdkDrawable *drawable, GdkGC *gc, GdkPixmap *src, - GdkDrawable *original_src, gint xsrc, gint ysrc, gint xdest, gint ydest, gint width, - gint height) + gint height, + GdkDrawable *original_src) { GdkWindowObject *private = (GdkWindowObject *)drawable; diff --git a/gdk/quartz/gdkdrawable-quartz.c b/gdk/quartz/gdkdrawable-quartz.c index 673da06477..be08c7db64 100644 --- a/gdk/quartz/gdkdrawable-quartz.c +++ b/gdk/quartz/gdkdrawable-quartz.c @@ -326,13 +326,13 @@ static void gdk_quartz_draw_drawable (GdkDrawable *drawable, GdkGC *gc, GdkPixmap *src, - GdkDrawable *original_src, gint xsrc, gint ysrc, gint xdest, gint ydest, gint width, - gint height) + gint height, + GdkDrawable *original_src) { int src_depth = gdk_drawable_get_depth (src); int dest_depth = gdk_drawable_get_depth (drawable); diff --git a/gdk/win32/gdkdrawable-win32.c b/gdk/win32/gdkdrawable-win32.c index c5a11ccffc..e6c7e45ef7 100644 --- a/gdk/win32/gdkdrawable-win32.c +++ b/gdk/win32/gdkdrawable-win32.c @@ -87,13 +87,13 @@ static void gdk_win32_draw_text_wc (GdkDrawable *drawable, static void gdk_win32_draw_drawable (GdkDrawable *drawable, GdkGC *gc, GdkPixmap *src, - GdkDrawable *original_src, gint xsrc, gint ysrc, gint xdest, gint ydest, gint width, - gint height); + gint height, + GdkDrawable *original_src); static void gdk_win32_draw_points (GdkDrawable *drawable, GdkGC *gc, GdkPoint *points, @@ -1144,13 +1144,13 @@ static void gdk_win32_draw_drawable (GdkDrawable *drawable, GdkGC *gc, GdkPixmap *src, - GdkDrawable *original_src, gint xsrc, gint ysrc, gint xdest, gint ydest, gint width, - gint height) + gint height, + GdkDrawable *original_src) { g_assert (GDK_IS_DRAWABLE_IMPL_WIN32 (drawable)); diff --git a/gdk/x11/gdkdrawable-x11.c b/gdk/x11/gdkdrawable-x11.c index 2b9b1d2c4e..9a69a3bb10 100644 --- a/gdk/x11/gdkdrawable-x11.c +++ b/gdk/x11/gdkdrawable-x11.c @@ -88,13 +88,13 @@ static void gdk_x11_draw_text_wc (GdkDrawable *drawable, static void gdk_x11_draw_drawable (GdkDrawable *drawable, GdkGC *gc, GdkPixmap *src, - GdkDrawable *original_src, gint xsrc, gint ysrc, gint xdest, gint ydest, gint width, - gint height); + gint height, + GdkDrawable *original_src); static void gdk_x11_draw_points (GdkDrawable *drawable, GdkGC *gc, GdkPoint *points, @@ -619,13 +619,13 @@ static void gdk_x11_draw_drawable (GdkDrawable *drawable, GdkGC *gc, GdkPixmap *src, - GdkDrawable *original_src, gint xsrc, gint ysrc, gint xdest, gint ydest, gint width, - gint height) + gint height, + GdkDrawable *original_src) { int src_depth = gdk_drawable_get_depth (src); int dest_depth = gdk_drawable_get_depth (drawable); -- 2.30.2